[release-4.21] OCPBUGS-73773: ensure deterministic zone ordering for control plane machines #10214

openshift-cherrypick-robot · 2026-01-13T22:01:56Z

This is an automated cherry-pick of #10188

/assign tthvo

…achines Control plane machines were intermittently being created in different availability zones than specified in their machine specs. This occurred because the zone list returned from FilterZonesBasedOnInstanceType used a set's UnsortedList() func, which has a non-deterministic order. When CAPI and MAPI manifest generation independently called this func, they could receive zones in different orders, causing a mismatch in machine zone placements between CAPI and MAPI manifests. This commit ensures that we sort the zone slices before further processing.

openshift-ci-robot · 2026-01-13T22:03:10Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-69923 has been cloned as Jira Issue OCPBUGS-73773. Will retitle bug to link to clone.
/retitle [release-4.21] OCPBUGS-73773: ensure deterministic zone ordering for control plane machines

Details

In response to this:

This is an automated cherry-pick of #10188

/assign tthvo

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

tthvo

/lgtm
/approve

openshift-ci-robot · 2026-01-13T22:03:20Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-73773, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #10188

/assign tthvo

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

tthvo · 2026-01-13T22:13:41Z

/jira refresh

openshift-ci-robot · 2026-01-13T22:13:49Z

@tthvo: This pull request references Jira Issue OCPBUGS-73773, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.0) matches configured target version for branch (4.21.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-69923 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-69923 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
bug has dependents

Requesting review from QA contact:
/cc @liweinan

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

tthvo · 2026-01-13T22:14:05Z

/cc @patrickdillon

patrickdillon · 2026-01-13T22:38:56Z

/approve
/lgtm
/label backport-risk-assessed

openshift-ci · 2026-01-13T22:39:25Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon, tthvo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [patrickdillon,tthvo]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

tthvo · 2026-01-13T23:38:19Z

/cherry-pick release-4.20

openshift-cherrypick-robot · 2026-01-13T23:38:22Z

@tthvo: once the present PR merges, I will cherry-pick it on top of release-4.20 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

tthvo · 2026-01-14T01:38:16Z

/test e2e-aws-ovn e2e-aws-default-config

liweinan · 2026-01-14T03:37:15Z

verified with the 4.21 build: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/release-openshift-origin-installer-launch-aws-modern/2011282382916685824

liweinan · 2026-01-14T03:37:23Z

/verified by liweinan

openshift-ci-robot · 2026-01-14T03:37:35Z

@liweinan: This PR has been marked as verified by liweinan.

Details

In response to this:

/verified by liweinan

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci · 2026-01-14T04:44:41Z

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci-robot · 2026-01-14T04:48:29Z

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-73773
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-73773 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

This is an automated cherry-pick of #10188

/assign tthvo

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-cherrypick-robot · 2026-01-14T04:49:32Z

@tthvo: new pull request created: #10219

Details

In response to this:

/cherry-pick release-4.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

liweinan · 2026-01-14T13:37:36Z

verification script: https://github.com/liweinan/my-openshift-workspace/blob/main/OCPBUGS-69923/verify-cluster.sh

anan@think:~/works/openshift-versions/421beta5$ ~/works/my-openshift-workspace/OCPBUGS-69923/verify-cluster.sh 
==========================================
Verify Machine Zone Consistency in Cluster
==========================================

Kubeconfig: /home/anan/works/openshift-versions/421beta5/auth/kubeconfig

✓ Successfully connected to cluster

Found 3 master machine(s)

==========================================
Check Zone Consistency for Each Machine
==========================================

--- Machine: weli-test5-w2478-master-0 ---
  Zone Label:        us-east-1a
  ProviderID Zone:  us-east-1a
  Spec Zone:        us-east-1a
  Subnet Filter:     weli-test5-w2478-subnet-private-us-east-1a
  ✅ Zone consistent

--- Machine: weli-test5-w2478-master-1 ---
  Zone Label:        us-east-1b
  ProviderID Zone:  us-east-1b
  Spec Zone:        us-east-1b
  Subnet Filter:     weli-test5-w2478-subnet-private-us-east-1b
  ✅ Zone consistent

--- Machine: weli-test5-w2478-master-2 ---
  Zone Label:        us-east-1c
  ProviderID Zone:  us-east-1c
  Spec Zone:        us-east-1c
  Subnet Filter:     weli-test5-w2478-subnet-private-us-east-1c
  ✅ Zone consistent

==========================================
Verification Summary
==========================================

Checked 3 master machine(s)

✅ Verification PASSED: All machines have consistent zones!

Cluster verification: PASS ✓

Fix verification successful:
  - Zone label, ProviderID zone, and Spec zone are all consistent
  - Machines are created in the correct availability zones
  -

openshift-cherrypick-robot assigned tthvo Jan 13, 2026

openshift-cherrypick-robot mentioned this pull request Jan 13, 2026

OCPBUGS-69923: ensure deterministic zone ordering for control plane machines #10188

Merged

openshift-ci bot requested review from bfournie and sadasu January 13, 2026 22:02

openshift-ci bot changed the title ~~[release-4.21] OCPBUGS-69923: ensure deterministic zone ordering for control plane machines~~ [release-4.21] OCPBUGS-73773: ensure deterministic zone ordering for control plane machines Jan 13, 2026

openshift-ci-robot added the jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. label Jan 13, 2026

tthvo reviewed Jan 13, 2026

View reviewed changes

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 13, 2026

openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 13, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 13, 2026

openshift-ci bot requested a review from liweinan January 13, 2026 22:13

openshift-ci bot requested a review from patrickdillon January 13, 2026 22:14

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 13, 2026

openshift-ci bot assigned patrickdillon Jan 13, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 14, 2026

openshift-merge-bot bot merged commit a6c94ff into openshift:release-4.21 Jan 14, 2026
15 checks passed

openshift-cherrypick-robot mentioned this pull request Jan 14, 2026

[release-4.20] OCPBUGS-73785: ensure deterministic zone ordering for control plane machines #10219

Merged

liweinan mentioned this pull request Jan 26, 2026

OCPBUGS-69923: Add static zone consistency validation test for AWS openshift/release#73935

Open

[release-4.21] OCPBUGS-73773: ensure deterministic zone ordering for control plane machines #10214

[release-4.21] OCPBUGS-73773: ensure deterministic zone ordering for control plane machines #10214

Uh oh!

Conversation

openshift-cherrypick-robot commented Jan 13, 2026

Uh oh!

openshift-ci-robot commented Jan 13, 2026

Uh oh!

tthvo left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Jan 13, 2026

Uh oh!

tthvo commented Jan 13, 2026

Uh oh!

openshift-ci-robot commented Jan 13, 2026

Uh oh!

tthvo commented Jan 13, 2026

Uh oh!

patrickdillon commented Jan 13, 2026

Uh oh!

openshift-ci bot commented Jan 13, 2026

Uh oh!

tthvo commented Jan 13, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 13, 2026

Uh oh!

tthvo commented Jan 14, 2026

Uh oh!

liweinan commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

liweinan commented Jan 14, 2026

Uh oh!

openshift-ci-robot commented Jan 14, 2026

Uh oh!

openshift-ci bot commented Jan 14, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jan 14, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 14, 2026

Uh oh!

liweinan commented Jan 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

liweinan commented Jan 14, 2026 •

edited

Loading